cleaned code
new build