Better coding for Functions Industry