cleaned up states