Remove unused code
Add comments
User reference to self and not this