Reformatted imaging-common code with CLC team template