Minor refactoring
Added TODO's