A few best-practices tweaks