refactor, cleaning