cleaned up code:  before & after text