Rearranged class methods as per convention