Code refactoring and optimization. Add hands images