Refactoring some class views