VID-1815 Arrange methods into more logical order