Got rid of extra variables