cleanup: formatting and remove instance vars in a few places