separated out model_sync code, removed static class.  Made other small changes based on code review