Refactor based upon Christina's review comments