Removed many Returns