Update per code standards