Fixed up some spacing issues