Cleaned some Code