Updated after review
* removed some forgotten 'pass'