Adjust code convention