Fixed most of the linting

[alcueca]

The code is easier to follow this way. I've fixed most of the linting, except:

• Where files need to be renamed.
• Where now is used.
• One case of a very long line.

These I prefer to discuss them before fixing them (if they need fixing at all).

Please merge this branch ASAP, to avoid code conflicts.