Continuing code refactoring