Start of cleanup/refactoring of Serving class