#48: Formatting for readability