Cleaned up formatting in older files to match current style