addressing long line comments from scrutinizer