Reordered the field methods and changed return types to references.