Merge pull request #402 from am11/master

Code: Minor cleanup