todo note
small refactoring of helper methods