removed some white space, commented out debugging code