Fixed services definition and code style