more refactor on Rebond framework