user checking, some style changes