Cleanup for first PR review. (Leave sleeps in place for now)