Minor changes (added TODO, cleaned code)