Refactor based on code review with team

These are the changes I would have made based on the code review we had with Andrew and Eric. Feel free to incorporate these changes or not. We can talk through them as well.