Refactoring
Signed-off-by: vraffael <vraffael.lins@gmail.com>