Tidied up a bit
More tidying