Couple of cleanups - encapsulate the new field and code format