Tonight's work: mostly cleanup, some optimization