Merge pull request #184 from fvaleri/cleanup

Code cleanup