Tidy up CWP elements