Simplified the return condition