some style fixes and composition