Cleaning this up.