using the extracted code now
renaming the class to be more meaningful
rename the instance references
add regex filter