[#23] Organise imports, remove unused imports, fix linting issues (#29)

[#23] Organise imports, remove unused imports, fix linting issues (#29) #206