Minor refactoring
Fix sonatype resolver