Changes to improve readability of the code

Merged Philip Müller requested to merge maitesin:master into master

Created by: maitesin

Merge request reports