[CLEANUP] Cleanup comprehensibility - scrutinizer feedback

A little clean up with respect to feedback given by scrutinizer.