Cleaning up code in various roles for next tag