Styles & Minor fix for debug flag