REFACTORING 

Change-Id: I5214d52c973fe21b1c4d37eb353839af4b801dd7
Signed-off-by: Martika <Martika@MC2>