Fixed a lot of linting issues