Finalised naming and formatted code