Reformated some of the code so the tabbing structure works
Commented more code