Cleaning up code style for consistency, no functional changes.