Clean up spacing, get rid of tabs