Fix namespace to detect class name simply
Use short class name
Fix indent