assginment 4 modifications and some cleancode.com changes for interest