Some spacing improvements