Clean up the code/formatting a bit