More formatting consistency