light refactor
minor refactoring