Clean up compiler warnings
Minor reformatting