Cleaned up handler code, using dereferences short variables