Refactor. Revert apt