Comment fix and using self:: for all on line 2153