removed some unnecessary injections, generalized variables in the list directive