Small format fix
Merging conflicts
General clean up of the adapter and translator
Some more cleaning up