Format changes in line with coding guidelines