another cleanup, adding *:after/before