Clean up for readability and semantics
Merge remote-tracking branch 'origin/master' into qa