Small refactorings according to a wiki