Updating to best (better?) practices