Style fixes; Merged toa/tos into ToString