cleaned code
built new version