refine come code conventions