Removed unused variables and fixed two comments