cleaned up master branch