Refactor a little more