Work on refactoring
Bronze refactors done