Coding Circumcision

A 20 year old patient comes with phimosis and undergoes circumcision. What are the appropriate ICD and CPT codes for this claim?

DX     CODE       DESCRIPTION
1        605             Phimosis or Redundant Prepuce

PX      CODE      DESCRIPTION         
1         64.0          Circumcision       

CPT   CODE      DESCRIPTION             

1        54161       Circumcision in patient older than 28 days                  

Circumcision is also usually done in newborns at the same visit in which they are delivered because of  tradition or as a prophylactic measure. This should be reported with CPT code 54160.

54160 Circumcision in neonates