Address comments / Rename some variables for clarity