Update comments and function names