fix #411: minor cleanup and closing the issue
thanks @vhuber