Fix missing self
Fixed some lint suggestions