Cleaned up spacing issues