[feature48 some style fixes