Refactoring app scope variables. Going with a more verbose naming convention.