adding more and better info
clean up code