[Kerry] clean code