Fixing some spacing here and there