* refactor function call style to address checkstyle Indent warnings