Removed unused code
Cleanup & simple narrative ouput in place