SYL-95 FIXED: several small style fixes