Code quality

[Sashen943]

Address coding style issues (± 150 issues) to improve code style.
These issues can be found on codacy and include:

1. Trailing white spaces.
2. Variable naming
3. Incorrect MARK: comments

Also have a look a code maintainability