Comments deleted. Some methods and variables renamed