Code cleanup of TracMe