automatic clock out minor refactorings #cash-102 Fixed