Remove external class usage, add 2 types
Remove external class usage, add 2 types
Chg some bad smelling code