pushed minor refractor updates