Some improvements / some comments removed