* cleaned code