Refactor and cleanup
Added todo items