modified the code convention