commit #8
- code Convention Apply
- Rename Vars