small fix, cleanup