Added 'Minor improvements