Updated some descriptions and removed unused variables