comments and naming
fixed merge conflict