Back to SNAPSHOT
Small refactoring
Javadoc updates