Could clean up comment