Move to SNAPSHOT build version
Improve formatting