*small refactoring
*view code