F1: Make code clean-up.

WIP
Cleaned-up Application class.