Minor renaming and commenting