[minor] Added support for before and after options for additional cleanup