Resolved some linter warnings.