Even more basic refactoring