cleaned code
merge