Address style and testing comments from Stefan/Wenbin.