comments and formating adjusts