Fixed warnings from TrailingWhitespace cop.
Fixed warnings from RedundantSelf cop.