Clean up and version bump to 0.1.5