clean up todo
refactoring