Minor cleanup
Some more cleanup (Issue #475)