Makes minor clean-ups