changes to conform with coding guidelines