fixed typos; made actual class instead of paramaterized class
broke apart each service part in to its own .pp