LEROY-417: adding logging to suspicious method, refactoring