Fixed unused imports
Fixed unnecessary modifier
Fixed redundant modifier
Fixed modifier order
Fixed sonar reported issues
Fixed sonar reported issues