Update comments and return value