Moved model & service instantiation to constructors