minor cleanup, fix export