1.1: Finished the refactoring established by T82 (I hope..)