Refactor a few