First bunch of making the code validate against the coding standard.