Simple refactoring.

- updates -