Cleaned some sode up