Refactor - change names with underscore to camel case and extract some part of code in separate methods