Minor updates to comments and parameter names