code-style fixed
yana-view minor refactoring