- refactorings + comments