Stopped using dictionaries where not necessary
Removed unused variable
Removed unused variable
Revert "Removed unused variable"

This reverts commit f64d88a2f7e9efc1ad49699056d39fa76c041efc.
Simplified application definitions