Cleaned some stuff