removed todo + refactored