[cleanup] Refactored star imports