Further code tidy