and more refactoring :)