Refactored

Signed-off-by: SrMouraSilva <mateus.moura@hotmail.com>