Clean code according to review