Updated some older code to match the coding style