View: code cleanup