[@Spiritzer]  I changed it and made it cleaner looking.  Let me know if I forgot anything.