More and more and more and more refactoring