wrong var assignment
remove unused statements
Merge pull request #329 from mpalourdio/clean

remove unused statements
Merge pull request #328 from mpalourdio/test

wrong var assignment