cleaned master branch