Cleaned up main app module.