Minor clean up to make things a little more polished, no more work for now.