Minor changes to comments and code for consistency
Bumping the version because of all the recent refactoring