small code cleanup and refactor
Merge remote-tracking branch 'origin/master'