Cleaned some types