remove state=
refactors
group methods