Reorder methods, minor reformatting before next round of real changes [1074]