updates for comments and naming