remove ya2yaml require + some minor refactor