Fix file name and make code easy to read

This pull request include these improvement.

- [x] Change File name 
- [x] Use for statement to make code easy to read
- [x] indented