refactored and removed task misunderstandings =)