Finished with #98, Code cleanup.