Avoid `self` where not required