Migrate to kernel style spacing