Fixing minor lint nits. Removing trailing whitespace.