Few best-practice updates