Cleaned Master Branch