Working on addressing Codacy issues.