making state use cleaner