Cleaning + adding the headers

as we decided we would do ;)