[REF] Numerous cosmetic refactorings