minor enhancement and coding standards