Co-authored-by: Omar López <zomars@me.com>
* refactor to keep consistencies in files * manual: more refactors * revert unnecessary changes * fix type errors * fix build error * fix