Added commenting and spacing