Massively cleaned up the pickup display code