Proc refactors.