refactoring
cleanup view
1.8 fix