Changes for code style to be more in line with our agreed conventions