Just a few more refactoring changes