Renmaed a few variables/parameters to make them more descriptive