Added import statement, some linting changes