Use Go formatting
Better error handling