Cleaned up spacing, again