* cleaned Code