Fix artifactId, #35.
Minor cleanup.