Publish to Sonatype OSS + minor clean up