Better formatted output
Removed more debugging code