fixed linter issues, and some styles