VE-1337 Fixes from CR - indentation