minor cleanups to fitgrains