Issue #26 cleanup, better names