Refactorings; no logic