Some reworks

- fixed headers
- cosmetic

Signed-off-by: Antoine Ténart <atenart@n0.pe>