Removed redundant return statements