[wip] small refactor

corrigi erro tipográfico

small refactor

added new funtionalaties and tests