Code re-factoring as suggested in feedback.