Added make lint
Fixed CS errors