Tidied up if branches for np==0