General refactoring notes