Moved comments out of code block