Switch to explicit enum sequence for serialization part

Also fixed two lint errors + ran gofmt
blame todd =P