refactorings and task entry spec