i will leave as is for now, at least it will work that way. but i think
refactoring that way sounds right.