Refactoring
Merge remote-tracking branch 'origin/master'
Refactoring, maintaining readability.