Refactoring
Signed-off-by:greenray <greenray@barracuda>
Refactoring
Signed-off-by:greenray <greenray@barracuda>