Improve formatting, plus Comment convenience methods