style fixes
merged with develop