Refactor to clean up the architecture a little