Small refactor at some views