More whitespace/indentation cleanup

Remove trailing whitespace