Renaming service_image_id vars to image_id to reduce confusion. Also some minor cleanup.
Renaming service_image_id vars to image_id to reduce confusion.
Also some minor cleanup.

n0ano/gantt,n0ano/gantt