Cholecalciferol (an inactive form of vitamin D) must undergo 2 conversion steps before it becomes the active form of vitamin D, calcitriol. Those steps take place in the _____ and the _____