Cleaned up application and initialization