Code standard commit
Keeping the branch up to date on the code standard.