Fixed further LINT issues