Some minor cleanup and naming refactoring
Merge pull request #184 from sisidra/master

Some minor cleanup and naming refactoring