Cleaned up spacing