refactored

Change-Id: Icbf2ad36221d723a9e60edbfd61fb4471e5f8fb9