Commit new refactor to master branch