Refactoring, codedoubling due to further refactoring dismissed.