code cleanup - added some fields: Ubuntu one