Fixes ENTESB-2041: Also implement tidy..