Clean stuff up
Make tests
go fmt