added non-intrusive format
remove debug includes