more refactors
something