Some changes as per a tech mananger cousin's recommendations