Fixed coments for introspection