Misc cleanup
Merge pull request #657 from bhariharan/min_42

Misc cleanup