Cleaned up questions and comments