Cleaning up gistId hack a little