Refactoring
Added TODO-list