finished cleaning up pretty printing