views: code cleanup