updated TODO
cleanup: unnecessary methods
change style for existing highlighting