refactored Draw for constructor injection of both dependencies