Started a refactoring cleanup