Renaming and code style

* Rename filter variables to better match their content
* Fix some code style issues with spaces in blocks (rubocop)