refactoring
refactoring
refactoring
fixed errors in sonar recorder