Tidied up lab 1