Cleanup some spacing