Code cleanup: order of methods.