refactor(views): use private var notation and othe clean-up