Add minor polish and changes