Refactorings

?