fix remarks + refactor