Refactor small things