Cleaning up main app a bit.