remove hardcoded parameters, fix variable name

Change-Id: I5de324bcb488ee12ad9d341b93a9a66bd07cda2c