Also moved some of the comments so they are will work better / are not within Code Documentation comments