v1.0.0-prerelease.4 Cleaning up and refactoring.