Made some simple updates and extracted out service.