Tidied up code
...