Refactor - further cleanup