Re-factored scheduled task furthermore