Cleaned up app config