Tidying up code before project submited.