Made some cosmetic changes to the code for hand in, not complete