Update and clean up
Merge pull request #1 from foratlanta/dev/workday

Update and clean up