Cleaned up and added script

There is still a problem on false positive