[CODE FORMAT] manual refactorings