More work on refactor