comment out debug code, made some slight visual improvements