Some values extracted to public fields
unnecesary code deleted