App module code cleanup