Updates to be in line with coding standards