Simplify / clean up.