refactored and fixed code inspections
refactored and fixed code inspections
Merge pull request #2 from Kostyan1488/master

refactored and fixed code inspections