Code was tested against the coding styles and fixed.