Some tidying up, and OAuth header names as constants