Cleaned some stuff up.