Addressed error level Codacy issues.