Clean up some code styling