Fixed long line
Added TODO for potential refactor