Refactored focus and tasks naming, removed dead code