Neatened up the code, corrected an error with the units, changed the author section to new email addresses and reformatted the code