More code tidy