clean code
Merge branch 'uchija'