Idea of refactoring
Missing type hint
Duplicated semicolon
Merge pull request #2 from cakper/idea-of-refactoring

[WIP] Idea of refactoring