r22: Code cleaning