Refactoring and bumping minor version number