whitespace clean up

Just some trailing whitespace removed and some space-tabs alignment.