Small spacing fixes

Small fixes based on feedback.