cleanup whitespace
adapt to current master
insert space
Merge branch 'noarbsabr'
simplify pricing