More Refactor