Removed some comments, added self=this

It's all better now.