Organze class methods to be consistent with rest of projects.