Resolve SNAPSHOT dependencies
Minor refactoring