Modified some headers and fixed some formatting.