Add/Delete Team Code cleaning complete

Have gotten the project back to the level of functionality it had last
week but the code is now easier to read. Still need to move around some
functions so they are in a more logical order but the code inside the
functions is now significantly easier to read.