Update comments and method names