Minor changes and commenting