Cleanup some coding styles