Additional Cleanup suggested by @raggi on #73