Refactor of some applications