User:DRY

General tidy up as I trip over things.