Updated code to be more conformant to style standard.