Refactor. ..