cleanup + correction
worked extension methods resolving