Indent using spaces and added missing BaseService