Buildable after refactoring
Some fixes
Go fmt