Restore previous method organization

Sorry @keithduncan, I just wanna make sure people can spot the
difference between old and new.