Cleaned crappy headers
Renamed types