Standardise code layout