Minor cleanups to module sketch