Fixed clear repeat condition
Updated TODO