Clean up/simplify.