Started changes on stg_devices
Cosmetic changes