fixed func call and some linting