Code Cleanup

- Standardized headers.