Minor Cleanups, going to go through eventually an really clean it up.  Refactor and move a lot of the stuff out to their own methods.