Refactor code toward underscore_case