case-3407 - Indent fix
case-3407 - Additional style changes