Do a little more refactoring