working on cleaning states