Cleaned master branch