Cleaned up todo