Cleaned up linter code a bit