Refactors logic after PR.
Bumps version number to release.