normalize files and whitespace fixes

forgot to include this yesterday