Fix conventions and cleanup x_ray.h and x_ray.cpp.