Minor refactoring 2 :)