Added missing constant and removed extra vars.