clean up code a bit
WIP
rename class
create test rule for screenshot