Minor cleanup, reorder of methods.