removed unnecessary return statements from certain methods