code cleanup, after hours added for param lookup