Minor formatting/output changes