REFACTORING

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