Do a little bit more refactoring