Small amount of code tidy
More code tidy