Cleaned up comments and question numbers