refactors made