AC: View code cleanup