cleaned up todo