Name spacing and cleaning up a little.