Some small tweaks to make refactor easiedr