00.40.15.140825

* Minor code and comment cleanup