Basic cleanup in prep for trying to fix #205