Moving refactor to master