just some cute refactors