- fixed variable names duplication
- removed leap test code in handlebar