Make changes after spacing fixes