Conducted a few clean-ups