code tidy after merge