[Minor] Organize imports to reduce warnings

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>