Use &&/|| instead of  and/or in code
Tidy up code
Tidy up code
Correct pointer on lists