A little cleanup in modification templates