Cleanup - more descriptive variable names and removal of unused variables