tidy some more
Working state