Refactoring: optimized imports, removed some SuppressWarning.