Cleaned up config / app base