Cleaned pickRay up