Updated version
Fixed formatting
Code reflow and removal of additional command line