code convention clean up