Made use of some unused variables