fix one var name and some style nits