remove comments
tests
refactor, update behaviour