Minor cleanup; updated POM