comments, refactoring, cleaning