cleaned code in general