some changes for style