Final refactor before turning in Project 4