refactor things
another TODO item