Minor code cleanup
Lab 5 starter code