* cleaned the code