Format fixes to keep with standard