more refacturing and reliable analyzing