Fixing some spacing issues