Removed more return statements"