Directory changes + "simplify control flow" func.