refactor(config): cleaned up config as per comments