Cleaned up files
Tweaked header