General unclassified refactorings