Refactored some imports