Moved the comments into the if and else if blocks per request.