Fixed syntax, solved linting errors