Changed else for direct return