Cosmetic changes to fix inconsistent spacing, optimize imports, etc