Refactors app