Removed many unecessary return statements.