Minor updates to comments and code