code review: refactor views