refactor a bit #2