Styling cleanup and remove return statement.