cleaned some codes