source cleanup - changing 'and' to '&&'