Cleanup method/varible ordering in the various places they are defined

Change-Id: I59ddd120737111c7abc4d497150ecc2b53a7f88c