comment clean up and naming change