Cleaning up. Snapshot before refactor.