Another clean up #168