review code, refactor titan test