more simple refactors