Vera++ fixes

code style fixes to please vera++