tested and finished Group 2

I made the source code "pretty". Now source code reads easier and is
more organized