Update for some of the coding standard before rearranging functions