Updated to remove newlines after comments