Added comments for readability, TODOs for possible improvements
GCP-6310