Some refactoring around the edges