Clean up (lint) and standardize ID/Secret.