Added stricter linting; fixing mistakes