some style fixes & clean up