Cleanup and moving to new extension method
Cleanup and moving to new extension method