Rearranged responsibilities a bit better