Cody tidy

Additional code tidy