Asgrim's refactorings