readjust headers & cleanup

Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>