Cleanup according to CR-SCL-70