Tidied up lab3