Minor cleanup and commenting