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