fix code smells and vulnerabilities