Commented views, refactored