hotfix/cleaning-imports

Organize imports, add return type for each method, clean code.