Clean up some code for consistency.