Cleaned and commented the headers
Cleaned includes