Code cleanup.gst