Cleaned up workstatus code.
Merge pull request #154 from kaspernj/kj/workstatus/cleaned_up

Cleaned up workstatus code.