Move ill-placed comments
Tiny clean-up
Abolish whoelsale
Add Abolish mapping
Abolish udpate