Modification to fit coding conventions.