show better
variuos refactoring
Merge branch 'trial'