master

Code tightening & polish.