Minor cleanup
Merge remote-tracking branch 'prglab/master'