small code cleanup
Merge remote-tracking branch 'stick/master' into stickmaster