Cleaned up app initiation