clean up todo
CHANGE SINGLE EQUALS