Finished. Done some cleanup.