Variables and tasks improvement