Cleaned up the todo questions and not understood questions