ticket:2 Code cleanup.