work logs cached, refactoring & cleaning