cleaned some stuff