light refactoring & TODO's