Added TODO, refactored