#17 Code cleanup