#4 Code cleanup.