Better formatting. See #58