Revised coding

Cleaned up some of the outputs