Just rearranging code.