made change for code review feedback: rename, add comment etc