simple refactors to make IDE happy
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/checkout.html
simple refactors to make IDE happy