Refactoring according to comments on #299

* direct reference to project object instead of rebinding
* removing hiding other version code