Refactor to simplify lab steps.