Organize imports, add return type for each method, clean code.
Merge pull request #30 from Spirals-Team/hotfix/cleaning-imports

hotfix/cleaning-imports