stripped TODO and unnecessary undersocres