Updating more comments and code style