Continue working on the refactor/cleanup