Fixed up the linting issues so far in the project