General cleanup
 - Replaced private constants with their HttpRequest equivalents
 - Replaced tabs with spaces again to match the rest of the code
Merge remote-tracking branch 'origin/master'