nweber Make some best practices adjustments.