[cleanup] Simplified code