Clean up application core, making methods more readable and simplifying procedures.