Updating code after looking at assignment requirements one last time