Rename function
Fix comments
Address comments