update nowin
small refact