Refactoring of methods to prepare the detection of theft code
stub in place for theft code