Update to match code standards