refactor bonita home usage