refactor a tad