Add extra spaces to make the main definitions easier to read