First Refactoring without Roo

Signed-off-by: ramonmartinl69 <ramonmartinl69@gmail.com>