Clear Codacy Issues

Clear current Codacy issues.