Fix spacing, add omitempty to struct definitions