A few more consistency fixes, removed trailing whitespace