Some style regularization and cleanup.