Fix up spacing issues created by default settings in VS