small refactor + added TODOS