refactors & cleanup.