Begin some code style cleanup.