Tonight's work; some cleanup, some optimization.