#22 Code cleanup.