servo: Address review comments