MBA Level 8 - clean up code