Did exercise 5
Standardised naming conventions