Making the code more corrct to the various standards