Refactor continued