Things cleaned up a little better.