Cleaned up self variable and comments.