Some refactor progress