Added header guards
Spacing