Cleaned up a tad.