Clean up to make coding style more consistent