Changed formatter, added failsafe

The failsafe is to properly initialze the data map with values at points
not null that could be used. Also changed the formatter to java
conventions, and changed the bleeding edge policy to avoid bloat
commits.