Refactor - reducing state/duplication
Some minor refactorings