Comment formatting and output left/right issues fixed