Cleaned up some spacing issues