Cleanup: use relative imports, adjust to line lenght