#9 Code cleanup