conform to the Style guide more