Update for code convention