Refactor based on Rachel's feedback