Merge pull request #36 from otknoy/refactoring

Refactoring
Fix syntax error
world + usa
Fix indentation