Some more refactoring
YAGNI a method
Some final refactorings
Fixing a careless mistake