Rubocop

* Favor modifier if usage when you have a single-line body.
* Trailing whitespace
Update CHANGELOG