Fix scrutinizer issues
Comments and formatting