#15 Code cleanup