Code Cleanup: Style
Rework headers according to filename change.
Code Cleanup: Style