Clean Akiva's code