Minor changes, format and comments