Cleanup
Add headers to files