End of last refactoring \o/