Tidied up code not needed